Skip to content

build: fix --shared-sqlite builds#55969

Closed
aduh95 wants to merge 1 commit intonodejs:mainfrom
aduh95:fix-shared-sqlite
Closed

build: fix --shared-sqlite builds#55969
aduh95 wants to merge 1 commit intonodejs:mainfrom
aduh95:fix-shared-sqlite

Conversation

@aduh95
Copy link
Contributor

@aduh95 aduh95 commented Nov 23, 2024

I'm not very familiar with the build system, I tried copying the ZLib config files, but I'm not sure if it all fits together.

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Nov 23, 2024

Review requested:

  • @nodejs/gyp
  • @nodejs/security-wg

@nodejs-github-bot nodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. needs-ci PRs that need a full CI run. labels Nov 23, 2024
@codecov
Copy link

codecov bot commented Nov 23, 2024 •
edited
Loading

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 87.99%. Comparing base (1919560) to head (c3280dc).
Report is 225 commits behind head on main.

Additional details and impacted files 
@@            Coverage Diff             @@
##             main   #55969      +/-   ##
==========================================
- Coverage   88.00%   87.99%   -0.01%     
==========================================
  Files         653      653              
  Lines      187872   187872              
  Branches    35888    35883       -5     
==========================================
- Hits       165328   165311      -17     
- Misses      15720    15725       +5     
- Partials     6824     6836      +12
Files with missing lines Coverage Δ
src/node_metadata.cc 91.66% <ø> (ø)
src/node_sqlite.cc 81.17% <ø> (ø)
src/node_sqlite.h 70.00% <ø> (ø)
src/node_webstorage.cc 72.20% <ø> (ø)
src/node_webstorage.h 50.00% <ø> (ø)

... and 24 files with indirect coverage changes

richardlau
richardlau reviewed Nov 23, 2024
View reviewed changes
deps/sqlite/sqlite.gyp
'SQLITE_ENABLE_SESSION',
'SQLITE_ENABLE_PREUPDATE_HOOK'
'conditions': [
['use_system_sqlite==0', {
Copy link
Member

@richardlau richardlau Nov 23, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you introduce this, something would need to toggle the value.

If configured with --shared-sqlite, this gyp file isn't included anyway (I verified that as part of #55409 (you can remove deps/sqlite if using --shared-sqlite and the build still works)) as per

node/node.gypi

Lines 231 to 233 in 6190bbc

[ 'node_shared_sqlite=="false"', {
'dependencies': [ 'deps/sqlite/sqlite.gyp:sqlite' ],
}],
-- if needed perhaps any addition defines should be set there?

Copy link
Contributor Author

@aduh95 aduh95 Nov 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hum yeah that makes sense. For reference, I'm opening this because I'm getting undefined reference to sqlite3session_patchset'when working on https://github.com/NixOS/nixpkgs/pull/357699, and Nix is using--shared-sqlite`

@aduh95 aduh95 closed this Dec 26, 2024
@aduh95 aduh95 deleted the fix-shared-sqlite branch December 26, 2024 15:48
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@richardlau richardlau richardlau left review comments

Assignees

No one assigned

Labels

c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. needs-ci PRs that need a full CI run.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@aduh95 @nodejs-github-bot @richardlau